v2.0.3 - legacy fix