Fix spec
Reverting crazy stuff