Fixes #1199