This time actually fixed double-quote bug