issue #1504