Fixed issue #202