Fixes #1570