Really fixing multicall