before structural changes
Still problem when calling yield
fixed