Add once tracker Bug Fix