implements #279