Added fix for single-quotes