Touch up to MAMsys-Dispose