Implementation of Issue #116 and Issue #73 Bug Fix