FIX: added function return in callback creator