Fix issue #425