Fix adding issues