alter the resolving logic