(temorary) solution for the database index problems ?!?!