Fix conditional assignment
Merge pull request #25 from jusjmkim/dev-justin

Fix conditional assignment