Fixes #1206