Fixed broken assign case

Closes #26