UPDATE

some fix. Thanks habrausers