Fix variable clash that was causing problems