+ remove redundant work-around