Fixed BaseDAO. refs #498