Collapse Commands, Fix re-registration bug