Fix for issue #173