Paper over the nan issues