Fixed issue #190