Fixing Issue #36 and Issue #37