Issue #33 fix and continued Issue #21