fix for structural changes