Issue #235: Fixing variable overwrite