Fix incorrect folder hierarchy shown. Patch was supplied by Awais Ahmad,
works fine here and is confirmed to work by several other users.
Closes bug #1009654 and patch #1082558.