Hangover workaround