Fixes #1598