Revert "issue  #246"

This reverts commit ff0846e96b1e654bd0130644ecdd25fdd34cfdbc.