2.0 demo fix