Fixed issue that occurred on startup