fixed collision (maybe this time?)