Fixinb a bug when property starts with ampersand