Fix issue #1546