Fixes #1095