adjusting to all posible 1.0.x\1.1.x