Fix for property parse