Issue #108 Remove Issue #61