Possible fix for issue #357
Closes #357