Corrected variable conflicts