Fixes ticket #7521 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 8096f52049)
8096f52049