Fixed issue #175