Temporary fix for profile fields not working great.