DB index fix (for real this time)