Fix for issue #182