+ fixed bug with canceling of type changing