Fix problem with wrong alias when adding the same field twice