Fixed issue #179