Partial fix for long quotes