Improve #82 and add IT to cover