Resolve issues2