Fix database not loaded problem
merge