BaJIepka's first fix