11.2.3 - fixed bugs arised in last version