Fixed the single quote issues