More workarounds needed, unfortunately