fixing UES-327 and UES-376