bug fixing for new users