Fixes #1170