Databse: fixed #1b58902