Added a horrible semi-solution to 7.2 (sorry, I've messed it up :/ )