pavel fixed bugs