fix bugs of standalone version B