Improve Bug with the DB is empty at the begining!