issue #1679