Add Tonikitoo patch for callback