Fixed and tested.