fixing regression for #2355, introduced in a129075