fix bug introduced by latest cleanup