Fix expansionGuard exit called without enter on the outermost entity

Fix expansionGuard exit called without enter on the outermost entity #185