Fixes #1659