Worked on issue #127