You can fix the caller issue by calling the original subroutine with goto &$org_sub;