Added Struct working control
bugfix