It seems we don't return the same structure here. Are we sure this will have no impact anywhere else?