temporary patch #1021