[DIRTY] Temp "fix" for evita

Banging head trying to get this working without this