First attempt to fix some pathological cases of the static resolution