Fix for issue #179