Fix first time and add to test.