Previous workaround did not work - trying a different one.