made some fix suggested