Fixes #1262