Reverted bbad030a9227db6ca2df42d393c38fb4db6817a4

Correct in devel branch, wrong in master branch (different counting).

Closes #166