Fixing regression from recent file movement