(#2577) - fix issue with callback not being defined