Fixes #1137