fixed issues with quoted arguments
fixed issues with quoted arguments