implements #88