Fix for issue #357