same fix layout2