Fixing 1.8 dependency