FIx also first and last serialization