Issue #37

Small patch for Issue #37