fixed bug before demo