implements #115