fixed problem with resolving