Update to v1.4 - Master fix