Again removing 7 line of duplication (with a BUG)