Right, i simplified code in 6a3fd98