Sloppy fix for variable collision