fixed collision bug.... maybe