fix Andrei S's comments