Fixed elasticity issue