fix bug and done work