Attempted to fix for 1.8, probably doesn't work but you never know