pt 2 of workaround.