Workarounds for CLJ-979