Fixed some another bugs (NOT AGAIN):