fixed wrong resolving