fixed bug
Merge branch 'bugfix/structure-isset' into develop