Fix issue #442