Recreation of gon issue #43