fix bug introduced with last changes