1.7 DB fix. IMPORTANT FIX