Fixes #1167