Upgrading to 1.2.4 from 1.2.3