The list version being committed with this one

Here is the list version working like it should be. Doesn't require
additional tmp-file for operation!