Fixes #1229