Fix bugs
Fix IdNumber bug