Fixes part of ticket #7146. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 5079e96bcc)
5079e96bcc