bug fix if needs end ;)