Panable bug fix