Bug Fix: Improper assignment