F1 qualifying is to be changed for the next race in Bahrain to avoid a repeat of the situation at Sepang where the McLaren drivers were penalised for driving slowly back to the pits while others were still on their qualifying laps.