Temp workaround for panic