Fix issue #1495