make it work on 1.8