Updated to support 3.4.2