Fixes #1193