Fix fails when class is empty