Fixes #1135