Related: issue #110
Related: issue #110