Add a work-around