fix the handling of id with .0 in the end