A long fix in Database