[WIP] Introduced a weird fix that seems to make the issue go away

Dafuq... no idea why this fixes it... any thoughts?