Fix for supporting call on multiple elements