fixed db support