Fix issue #1485