fixing issue #423