See 348f5704d742dd95687f614fec38f974f2993cfa and #26