Minor bug fix prevent it from panicing far too early!