Fixes #1306