REally fix Issue #37