Trying again to make it work with 4.2.0.beta2