Attempt at fixing random demo issue