Fix for issue #359