safer version of workaround