Implementation of #122