Better workaround for #2975