Fixes #1136