fixed compatibility with current Fuel versions