Fixed issue #186