fixing #535 : replacing space by underscore