New: work-around