[#14] Fixed id bug