Comments teun fixed