Fixing breaking change by using call