Leading MotoGP riders have called for the Losail circuit to be resurfaced in time for the 2018 Qatar Grand Prix, following the difficulties in this year's race.
The circuit outside of Doha opened in 2004, holding its first MotoGP event that year, and has hosted the opening round of the championship every year since '07.
However, it has not been resurfaced in the 13 years it has been open, which combined with the race being held at night in relatively low ambient temperatures leads to low grip levels and tough conditions for riders.
Rain during last weekend's season opener also highlighted major drainage issues, and led to qualifying being cancelled.
"The asphalt needs to be changed, and I hope it's for next year," Ducati's Jorge Lorenzo said.
"We spoke a little bit in the Safety Commission [on the Friday in Qatar] but we didn't get deep in that area."
Honda's world champion Marc Marquez believes work is on the agenda, and also hopes it is in time for the 2018 race, to help handle any repeat of last weekend's wet weather.
"I know they are thinking to resurface [the track] - if not this year, then in two years, because already it's 13 years old, this asphalt," he said.
"Then maybe they can check to find a way to find some [drainage] solutions, but it's not normal, to have that kind of weather.
"Always it's a possibility and in the future they can be more ready."
MotoGP safety representative Loris Capirossi believes resurfacing the Losail track will be part of measures taken to improve drainage.
"We are already talking to the track to try to improve a lot of things, because the riders started to complain a bit about the surface," Capirossi said.
"The surface is from 2004 when they built the track.
"We have already some plans for next year. We want to do some work on drainage.
"We are already working with the circuit about [resurfacing]; we don't have the answer now but this our number one plan."