Fixed WindowContainerFix