#18 additional fixes to fix double qoutes to single