[Dry] (Hopefully) fixed the latest bugs