TB-47 Fixed bugs
TB-47 Fixed bugs