Fix for issue #1110