Quick fix for Jeff's callback