Fix duplicate assignment