fix bug and submit