If the previous changes didn't fix this, it means that it isn't working correctly... we should fix that rather than add another workaround.