Fixes #1493