fix resolving with @