demo fix bugs