Some fixes to handling state boundaries with default state
Simplified code example