Fix to return id