Implementation of #109