Resolved call & field related issues (V1.7.3)