Adding workarounds