Fix last entry mismatch error
Fix last entry mismatch error