Panic fix bug