changes from Vinay - quotes issue fix