fixed that awefull issue