#326 Solve Problem in demo stage.. (die...)