temporary patch for oscar 0.6