fixed work-around