fix this one so it is not depending on the database template