Fix again for #2359