tweaked structure matching
minor