fixed last and uncommented