[B] Hot fix