Fixes ticket #6990. Tested-by: James Almer <jamrial@gmail.com> Reviewed-by: Mark Thompson <sw@jkqxz.net>