fixed bugs during demo