Quick and dirty 1.8 fix.