removed temporary workarounds