I did some more investigating and research and came across another post which had a fix:
The fix on there from fabrizim works perfectly!