Hot: work-around