small common code fix