Fixed longstanding "duplicate override folder" bug