Fixed descriptor issue