Optimize the resolving a little bit