Fixing variable collision...