This needs to change as well for the spec tests to pass