Demo source fix