Don't return too early or we risk corrupted data