Restructured method based on comments by titanous

The i >= 1 check is required, because otherwise the testsuite breaks
down.