Fixed calling before classes