This Issue extends #139
This Issue extends #139