Fixing 1.8 compatibility