Fixes #1122