Edit Property Fixed