Fixed assignation issue