updating fix for issue #201