Enforce source value for callback
Implement feature #113 , tell me if I skip something else