Fixes #1157