fixed weird behaviour of UCHI.