Implemented workaround for clients passing arguments with "&"