Yeah, Kenji is awesome ;)
Gonna revert this crappy wrokaround then.