Fix issue #438