Fix for Hippie change.