Bug fixing for the last changes