Major crash fix for new users.