Fixes #1216