Fixed calling incorrect callback