Fix too much resolving