Fix for issue #775