Fix for issue #763