Backpack Crashing Fix

Quick fix to stop that shit
Merge remote-tracking branch 'upstream/master'