Fix for issue #163

Fix for issue #163