Merge fix xian 2.0

db.close() error again