fixed: database issue