Fix issue #453