Tried this solution but seems like an old fix compared to the latest version that comes with this fix