Fixes #1052