Fixed incorrect panics