Issue #91 and Issue #109