[#258] Changed order