Fixed includeFlat layout