Fix issue #423 ()