Fixes #1114