fixed 1.8 stuff