Fixing ID service bug