task #761 and BaseDao