This fixes taking in account the published state