This is proposal to issue #24