Fixes #1219