This was already fixed in 2.0. A bit of a hack to make it work in 1.9 too.
Hopefully there won't be any side-effects.