Fixed MainEntry