Fix #7 : Improve assignment