Fix issue #468