temporary fix for 16-files-problem