recommit of issue#9