US8 and US11 fixed bugs