fixes + replacement of 1.0.15*