And unit test fixed. :-)