Fix render for 2.1.

This was already fixed, but only for branch 2.2. Because branch 2.2 is not recommended for production this should be also fixed in 2.1.