Further workarounds