Fixed main class