Potential database fix