Fix issue #455