Actually applies last fix

The last update wasn't fully ready to merge. Pushing again, hoping for
the best.