Fixed 1.8 syntax compatibility