Fix for issue #933