collision fix & nova fix