fixed error and format