Trying some more workarounds.