[PS102] need more bug fixing