Fixed main class issue