v2 Fix for Single-quote error