Updated to fix spec tests.