fix compability with master