Hax to get runing on 1.9.3