Fixing 1.8 syntax