Fixes #1176