fix issue #37 (attempt)