Fixes #1213