Fixing first launch reset bug