#46: Resolve