Fixes more resolve bugs