That's pretty nasty :) But it works for me. I've added that and squashed the commits.