Fixed parsing of key=value pair