Hopefully last of the quote issues