Modal hacks

:facepunch: