Fix measurement collection