Fixed issue #209