fixed error 145 a bit cleaner