floating line fix
Merge branch 'hotfix-0.8.2'