Fixes #1173