Now fixed to pass all Spec tests.