Database manager fixed