Fixes #1573