Fixed callback issues