Fixed parsing of properties with spaces.