Resolve and Resolve Legacy variants now work as they should