Fix for issue #395