Added quote failsafe