Work on 1.39