Merge branch 'fixrounding'