Fixing missing attribute
Supporting client side distortion