Fixed Demo for v4.0.0