Make it work on 1.3.8