dao bugs fixed