implements #64