Local Resolve fixing