Fixed issue #423