Fix issue #457