Fix on the go pick