fix resolving class