Persisting calling name & label issue resolved (#172)