#136 Corrects ids, following the standard.