Fix overriding to only override, when data to override is available