Fix optional's assignment (#2)
Merge branch 'fix-optional-assignment'