Stoskov fixes