Removed the workaround quoting