Circular class call fixed