v0.3 - Fix wrong IDs