Fix without array_flip + code clean