Fix spec after merging #598