Fixed bugs interruption