Fixed disable/re-enable order