fix during class