Fixes #1572