#19 Renamed variable to avoid confusion