Added forgotten appart by initial parsing