Patch non-working dash and underscore