Making the quote hack less ugly..