Fixing id service bug