Finish the last fix..