21/8/14 heng morning

bug fixed for UAT36, 37 and 50