Resolve fixs