Fix view resolving