fixed #27 better handling of parameters' case