FIX FOR DB CLASS