Final change for 1.2.1