Added fix for local calling codes:
replace leading 0 with default calling code