Fixed Andrey's comments