fixes from xiu