Fixed calling Bug