ticket:3. Fixed according to comments