Fixed according to comments