Fix bug with parsing properties