Fixes in skipping bad data