Added needArgs to callback case