Fix issue #1624