soft fix [#281]
changes November 1st 2013