Fix style resolving