test, and logic collaps fix ;)