Fix issue #1456