Issue #50 and Issue #42