Fixed a bug where multiple assignments or un-assignments might fail to save