I'll create separate task for this issue.