Fix IdNumber bug