corrected AssignValue macros