Late v1.2 fix