Oops. Last commit was partially wrong.
Thanks scoof