Fixed according to review