kirilliv bugs fixed