Fixes #1568