Without mixedcontent2

This is a correction of commit c00a2a99c79824c3411953b9a98a9c32232dd53f