Fixed bad data bug