Fixes #1603