- #(344) - Correct property parse bug

- #(340) - Correct property parse bug