fix affix distance from top
Merge branch 'stage'