corrected sourceOf and targetOf