Fixed issue #184