Fixes #1053