Fixes #1200