fixing response to structural changes