Possibly Fix Issue #37