fixed broken resolving