Fixes #1096