Fix for issue #969