fixing UES-422 and UES-399