Fix spec and class