Corrected variable assignments