fixes the breakage introduced by the recent merge