Simple row set mapper fixed