Fix RC 1.2