for demo mode and comment fix