Fixed adding to prevent double adds