fixed a misplaced +1
Merge branch 'master' into bugfix