Structure optimization (step 4)
bugfix