Fixes #1269