Fuel shortage "on way to being resolved"