Added some dequoting