GUI-1322
fixed entities