Patched up to pass all tests.