untracked issues fixed