Fixed further issues with quotes