Wrapping resolver moved to construction step