Fix breakage introduced by #21