Fix for issue #897