Yea, sorry, when I committed, it was over your new changes. I thought cherry-pick-ing the previous commit would've fixed this.
I applied the changes David suggested below, hope that solves the problem.