Fix for underscores