cleaning up bugs created by previous commit

- Fixing broken assign operation