implements #122