fix for underscores