Fix for issue #180