Fixed callback bugs