Continued working on work-around