as long as im not entirely sure about the correctness of this modification i will revert the set/add change to not have created a new source of bugs,