Fix issue #1522