Fixed issue #187