Fix issue #466