some of fix ;)