Issue #37 Fixed