#77 and #88