fix Vanya's changes