Implementation of #108