Fix sentinel issues
Fix sentinel