Merge pull request #766 from khawkins/unstable

Fixing the spec