Bugfix on first start