Fixed bug in last commit where values weren't being quoted properly