Right now I feel like I'm tapping the iPlayer with a very small hammer to fix this annoying bug without breaking something bigger b4 release