Fix for issue #960