More 1.8 stuff. 
Why am I doing this?