Fixes #1163