implements #2098