fixed quote issues