implements #53