Fix for issue #894