TB-47 Fixed bugs