SQUASHED: 4.8 Fix