Fixed some class not being changed