Fixes #1288