Fixed Ross's bug