Get working with 1.5.2