Fixed according comments