Fixed issue #176