Fixed class resolving