Correcting bug in Workaround.