kirillov fixed bugs