Add respect for disabled state