Even more workarounds! :)