Fixed fatal bug for new users