Fixes #1285