Fixed that last commit, and added specs for it <blushes>