Bugfix for folder/file completion