fine tuning for 1.2.4