Fixed db shit