hope i fixed the critical bug