Fixes #1683