Fixed Issue #37