closure advanced optimisation broke it, now fixed