It was a little bit messy with the closure fix... Well ok, I can revert that.