Fix for issue with quotes