add return when disabled