Fix to metric deref