Resolve 2 Issues