Fix for allowing white spaces before and after parameter values