bluebanana fix, avoid end_mask and not mask_selection