Be compatible with omd 0.7.0