Handle records wrapping