Compability fix