Fixed #26 part2