Fix - should not return function value when callback is provided