Fix: Issue on startup