closing issues: 66, 68, 27