Fixed issue #223