Fixes #1607