Fixed calling issues