hotfix for upstream bug