Severe bug fix for new users.