Fix for issue #181