Fix issue #1525