fix bug introduced from last merge