Fix quote support