Fix spec, take 2