Fixed a bug with O. Now complete.