Fixed reassign bug