Elasticity fix