Fixed bad data handling.