Fix for issue #175