Patch 2

Fix for issue #957