Better fix to the demo compilation issue