Quote block v7 fix