fixed bug introduced with the new way to get the source of the callback function