Fix for orphaned files