fix the demo as per luis suggestion