Fix up assignment