Fixes #1289