Fixes #1125