small fix to maintain bottom section
Merge branch 'master' into testing