Commit Kate's version since it actually works