Fix for issue #356