changing code for managing coming 1C changes.
will fix(in future) #88 && #89