Callback pickiness fix.