closing issues: 42, 67 (revisited)