Fixes #1207