Fix for first time users