Added workarounds