disabled two WORKAROUNDS