Fix instance-id method