Merge "fix callback handling"