Fix for issue #773