To issue #261

still in process