Fix via #3212 for 2.0.11