[fix] better workaround