Commit 7da463838ad9d8b49c7f0453a0a172bfb2b738f0 should fix the problems with this section.

Please check it for me.