Fix issue #449