Additional panic fix