Fixes #1197