potentially fixes #1228