Fixes #1112