Fixing startup bug (empty DB)